From 182cc428244c9fc2ac9046d143555b2a4beb4807 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 27 Oct 2008 18:03:47 +0000
Subject: [PATCH] Revert r42658 "(bug 10347) Add subtitle message for protected
 pages" It's just too annoying and disruptive IMHO.

---
 includes/SkinTemplate.php         | 32 ++++++++-----------------------
 languages/messages/MessagesEn.php | 12 ++++++------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 28c63cd080..33307e3133 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -203,7 +203,12 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'isarticle', $out->isArticle() );
 
 		$tpl->setRef( "thispage", $this->thispage );
-
+		$subpagestr = $this->subPageSubtitle();
+		$tpl->set(
+			'subtitle',  !empty($subpagestr)?
+			'<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle():
+			$out->getSubtitle()
+		);
 		$undelete = $this->getUndeleteLink();
 		$tpl->set(
 			"undelete", !empty($undelete)?
@@ -411,8 +416,7 @@ class SkinTemplate extends Skin {
 				if ( $nt ) {
 					$language_urls[] = array(
 						'href' => $nt->getFullURL(),
-						'text' => $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
-							$wgContLang->getLanguageName( $nt->getInterwiki()) : $l,
+						'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
 						'class' => $class
 					);
 				}
@@ -431,12 +435,6 @@ class SkinTemplate extends Skin {
 		$content_actions = $this->buildContentActionUrls();
 		$tpl->setRef('content_actions', $content_actions);
 
-		$subpagestr = $this->subPageSubtitle();
-		$tpl->set(
-			'subtitle',  !empty($subpagestr) ?
-			'<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle() : $out->getSubtitle()
-		);
-
 		// XXX: attach this from javascript, same with section editing
 		if($this->iseditable &&	$wgUser->getOption("editondblclick") )
 		{
@@ -654,7 +652,7 @@ class SkinTemplate extends Skin {
 		wfProfileIn( __METHOD__ );
 
 		global $wgUser, $wgRequest;
-		$action = $wgRequest->getText( 'action', 'view' );
+		$action = $wgRequest->getText( 'action' );
 		$section = $wgRequest->getText( 'section' );
 		$content_actions = array();
 
@@ -698,26 +696,12 @@ class SkinTemplate extends Skin {
 						'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
 					);
 				}
-				# Give notice if this page is locked for others
-				if( ($action == 'view' || $action == 'purge') && $this->mTitle->isProtected( 'edit' ) ) {
-					$wgOut->appendSubtitle( "<span class='plainlinks'>" . 
-						wfMsgExt('protected-sub-allowed',array('parse'),$this->mTitle->getFullUrl('action=protect')) .
-						"</span>"
-					);
-				}
 			} elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) {
 				$content_actions['viewsource'] = array(
 					'class' => ($action == 'edit') ? 'selected' : false,
 					'text' => wfMsg('viewsource'),
 					'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
 				);
-				# Give notice if this page is locked
-				if( ($action == 'view' || $action == 'purge') && $this->mTitle->isProtected( 'edit' ) ) {
-					$wgOut->appendSubtitle( "<span class='plainlinks'>" . 
-						wfMsgExt('protected-sub-disallowed',array('parseinline'),$this->mTitle->getFullUrl('action=protect')) .
-						"</span>"
-					);
-				}
 			}
 			wfProfileOut( __METHOD__."-edit" );
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 208655a5a5..d67677266c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2128,6 +2128,7 @@ Each row contains links to the first and second redirect, as well as the target
 You can narrow down the view by selecting a log type, the user name (case-sensitive), or the affected page (also case-sensitive).',
 'logempty'             => 'No matching items in log.',
 'log-title-wildcard'   => 'Search titles starting with this text',
+'logshowhide-patrol'   => '$1 patrol log',
 
 # Special:AllPages
 'allpages'          => 'All pages',
@@ -2999,12 +3000,11 @@ This is probably caused by a link to a blacklisted external site.',
 'markedaspatrollederror-noautopatrol' => 'You are not allowed to mark your own changes as patrolled.',
 
 # Patrol log
-'patrol-log-page'    => 'Patrol log',
-'patrol-log-header'  => 'This is a log of patrolled revisions.',
-'patrol-log-line'    => 'marked $1 of $2 patrolled $3',
-'patrol-log-auto'    => '(automatic)',
-'patrol-log-diff'    => 'r$1', # only translate this message to other languages if you have to change it
-'logshowhide-patrol' => '$1 patrol log',
+'patrol-log-page'   => 'Patrol log',
+'patrol-log-header' => 'This is a log of patrolled revisions.',
+'patrol-log-line'   => 'marked $1 of $2 patrolled $3',
+'patrol-log-auto'   => '(automatic)',
+'patrol-log-diff'   => 'r$1', # only translate this message to other languages if you have to change it
 
 # Image deletion
 'deletedrevision'                 => 'Deleted old revision $1',
-- 
2.20.1